Use TypeDurationSecond for TTL values in PKI. #3270
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This has the side effect of simplifying logic quite a bit. This also fixes/changes parseutil.ParseDurationSecond to return a duration of 0 if the input is a string but empty.
vishalnayak
previously approved these changes
Aug 31, 2017
| t.Fatal(err) | ||
| } | ||
| if resp != nil && resp.IsError() { | ||
| t.Fatalf(resp.Error().Error()) |
There was a problem hiding this comment.
Is there a need for double Error() here?
There was a problem hiding this comment.
maybe if I switch it to t.Fatal -- t.Fatalf expects a string, and resp.Error() returns an error
builtin/logical/pki/cert_util.go
Outdated
| ttl, err = parseutil.ParseDurationSecond(role.TTL) | ||
| if err != nil { | ||
| return nil, errutil.UserError{Err: fmt.Sprintf( | ||
| "invalid requested ttl: %s", err)} |
There was a problem hiding this comment.
This may not be a requested ttl. Its coming from role. Can we change the error message?
builtin/logical/pki/cert_util.go
Outdated
| if len(role.MaxTTL) == 0 { | ||
| maxTTL = b.System().MaxLeaseTTL() | ||
| } else { | ||
| if role.MaxTTL != "" { | ||
| maxTTL, err = parseutil.ParseDurationSecond(role.MaxTTL) | ||
| if err != nil { | ||
| return nil, errutil.UserError{Err: fmt.Sprintf( | ||
| "invalid ttl: %s", err)} |
vishalnayak
approved these changes
Aug 31, 2017
chrishoffman
pushed a commit
that referenced
this pull request
Sep 1, 2017
* oss/master: Plugin Version Update (#3275) Lazy-load plugin mounts (#3255) changelog++ changelog++ Add pki/root/sign-self-issued. (#3274) Travis, be happier please changelog++ Change auth helper interface to api.Secret. (#3263) changelog++ Try reconnecting Mongo on EOF (#3269) Don't append a trailing slash to the request path if it doesn't actually help find something (#3271) changelog++ Use TypeDurationSecond for TTL values in PKI. (#3270) changelog++ changelog++ Use net.SplitHostPort on Consul address (#3268) Normalize plugin_name option for mount and enable-auth (#3202) Updating Okta lib for credential backend (#3245) Explicitly mention that aws/aws-ec2 were unified under aws.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This has the side effect of simplifying logic quite a bit.
This also fixes/changes parseutil.ParseDurationSecond to return a
duration of 0 if the input is a string but empty.